revert last change.

2007-05-21  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkcombobox.c (gtk_combo_box_set_model): revert last change.

svn path=/trunk/; revision=17886

diff --git a/ChangeLog b/ChangeLog
index bfeaf49854e532acd248b0720381009545f925d3..7c373f80a4a2e6f58c482b12bdcfbbe1821ac74d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-21  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): revert last change.
+
 Mon May 21 13:58:32 2007  Tim Janik  <timj@imendio.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 6d3af0ea0147007ea10b97f3573749af302db9c1..93e6b924cfb7ea617d4d457ad23322eb1494fc57 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4807,7 +4807,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
                          GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
+  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
 
   if (model == combo_box->priv->model)
     return;